Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(datasource): add eks addon datasource #33272

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open

feat(datasource): add eks addon datasource #33272

wants to merge 29 commits into from

Conversation

ivankatliarchuk
Copy link
Contributor

@ivankatliarchuk ivankatliarchuk commented Dec 24, 2024 •
edited by viceice
Loading

credits to #29613

What is in this PR

  • sync @aws-sdk/client-* dependencies
  • added extra tests
  • supported case when cluster version is not specified
  • added aws-eks-addon versioning. This will not require "ignoreUnstable": false
  • added defaultConfig as default prTitle not able safely parse packageName object
    Screenshot 2024-12-26 at 16 37 51

Branch name is dodgy as well, no fix in this pull request, but can tweak it, just feels like missing something like {{ toString packageName }}

Screenshot 2024-12-26 at 15 54 41

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

@ivankatliarchuk
feat(23410): eks addon refresh
fbf6e8b 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
Merge branch 'main' into feat-23410
0364b73 
* main:
  fix(deps): update ghcr.io/renovatebot/base-image docker tag to v9.27.4 (renovatebot#33271)
@ivankatliarchuk ivankatliarchuk marked this pull request as draft December 24, 2024 17:50
@ivankatliarchuk
feat(23410): update package json
d314263 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
update pnpm-lock.yaml
7264215 
Signed-off-by: ivan katliarchuk <[email protected]>
@viceice viceice changed the title feat(23410): eks addon refresh feat(datasource): add eks addon datasource Dec 24, 2024
@ivankatliarchuk
feat(23410): update as per linter
33414f4 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
feat(23410): update dependencies
e784702 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
feat(23410): fix linters
d0775cc 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
feat(23410): fix linters
b071797 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
feat(23410): added support for versioning
dffe55e 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
feat(23410): added tests for schema. prettier-fix
1a64d1a 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
feat(23410): fix all tests
d551b46 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
feat(23410): update package.json deps and loc
8c7a10b 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
Merge branch 'main' into feat-23410
6663a43 
* main:
  chore(deps): update python:3.13 docker digest to 08371fa (renovatebot#33282)
  build(deps): update dependency @opentelemetry/instrumentation-bunyan to v0.45.0 (renovatebot#33281)
  build(deps): update opentelemetry-js monorepo (renovatebot#33279)
  fix(deps): update ghcr.io/renovatebot/base-image docker tag to v9.27.5 (renovatebot#33278)
  chore(deps): update python:3.13 docker digest to c286f03 (renovatebot#33277)
  chore(deps): update containerbase/internal-tools action to v3.5.15 (renovatebot#33273)
@ivankatliarchuk ivankatliarchuk force-pushed the feat-23410 branch 2 times, most recently from e4a2bbf to 6663a43 Compare December 26, 2024 16:48
@ivankatliarchuk
Merge branch 'main' into feat-23410
1e59984 
* main:
  feat(preset): Add oracle database jdbc and nls monorepo groups (renovatebot#33287)
  chore(deps): update python:3.13 docker digest to cea505b (renovatebot#33285)
  chore(deps): update python:3.13 docker digest to a76a2a0 (renovatebot#33284)
  chore(deps): update python:3.13 docker digest to 52d1bb8 (renovatebot#33283)
@ivankatliarchuk ivankatliarchuk marked this pull request as ready for review December 26, 2024 16:48
@ivankatliarchuk
feat(23410): increase code coverage
2c5724a 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
feat(23410): prettier fix
e9a9022 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
feat(23410): prettier fix
339b63f 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
feat(23410): prettier fix
23c386b 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
feat(23410): cover all lines for aws-eks-addon versioning
6824963 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
Merge branch 'main' into feat-23410
a9b061a 
* main:
  chore(deps): update ghcr.io/containerbase/devcontainer docker tag to v13.5.3 (renovatebot#33291)
  fix(deps): update ghcr.io/containerbase/sidecar docker tag to v13.5.3 (renovatebot#33292)
@ivankatliarchuk
Copy link
Contributor Author

Hi, @viceice. Is there any chance you have a look?

viceice
viceice reviewed Dec 27, 2024
View reviewed changes
Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please split PR. move versioning to be merged first

@ivankatliarchuk ivankatliarchuk mentioned this pull request Dec 27, 2024
Merged
6 tasks
@ivankatliarchuk
Copy link
Contributor Author

Added Versioning #33301

@ivankatliarchuk
Copy link
Contributor Author

ivankatliarchuk commented Dec 27, 2024 •
edited
Loading

Shell I w8 for versioning to be merged and then rebase this pull request or?

rarkins
rarkins previously approved these changes Jan 8, 2025
View reviewed changes
viceice
viceice reviewed Jan 30, 2025
View reviewed changes
lib/modules/datasource/aws-eks-addon/index.spec.ts Show resolved Hide resolved
lib/modules/datasource/aws-eks-addon/index.spec.ts Outdated Show resolved Hide resolved
lib/modules/datasource/aws-eks-addon/index.spec.ts Show resolved Hide resolved
lib/modules/datasource/aws-eks-addon/index.spec.ts Show resolved Hide resolved
lib/modules/datasource/aws-eks-addon/index.spec.ts Show resolved Hide resolved
lib/modules/datasource/aws-eks-addon/index.ts Outdated Show resolved Hide resolved
lib/modules/datasource/aws-eks-addon/index.ts Outdated Show resolved Hide resolved
lib/modules/datasource/aws-eks-addon/index.ts Outdated Show resolved Hide resolved
lib/modules/datasource/aws-eks-addon/index.ts Outdated Show resolved Hide resolved
lib/modules/datasource/aws-eks-addon/index.ts Outdated Show resolved Hide resolved
@ivankatliarchuk
Copy link
Contributor Author

ivankatliarchuk commented Jan 30, 2025 •
edited
Loading

Hi viceice.

I could not change to toHaveBeenCalledWith or to toHaveBeenCalledOnce. Agree it's cleaner, but I'm getting errors like

Error: expect(received).toHaveBeenCalledOnce(expected)

Matcher error: "received" must be a mock or spy function

If I understand correctly, since mockClient doesn’t create a Jest spy, we cannot use .toHaveBeenCalledOnce(). These are the sources https://github.com/m-radzikowski/aws-sdk-client-mock/blob/3981b97a249a05610f8751d86a5c3428959f0112/packages/aws-sdk-client-mock/src/mockClient.ts#L13

And at this moment, this branch requires #33301 but the origin for that branch is main, not feat-23410-versioning, just to reduce the size of this pull request.

That's why there are comments like

// import * as awsEksAddonVersioning from '../../versioning/aws-eks-addon';

I think I may have misunderstood your earlier proposal to split this pull request, and created this mess as a result.

viceice
viceice reviewed Jan 31, 2025
View reviewed changes
Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can now be continued

@ivankatliarchuk
Merge branch 'main' into feat-23410
568d2aa 
* main:
  docs(versioning): fix types and tests (renovatebot#33958)
  feat(gitlab): add branch status check attemps (renovatebot#32692)
  feat(versioning): aws-eks-addon versioning added (renovatebot#33301)
  feat(nix): rework to work with all flake inputs (renovatebot#31921)
  fix(deps): update dependency mkdocs-material to v9.6.1 (renovatebot#33956)
  fix(deps): update dependency mkdocs-material to v9.6.0 (renovatebot#33955)
  fix(deps): update ghcr.io/renovatebot/base-image docker tag to v9.38.3 (renovatebot#33954)
  fix(deps): update ghcr.io/renovatebot/base-image docker tag to v9.38.2 (renovatebot#33953)
  feat(logger): Add `withMeta` helper (renovatebot#33948)
  feat(schema): Add logging utilities for catch calls (renovatebot#33950)
@ivankatliarchuk
feat(datasource): add eks addon datasource. uncomment versioning
faea0d2 
Signed-off-by: ivan katliarchuk <[email protected]>
@ivankatliarchuk
Copy link
Contributor Author

Tested. It works ik-workshop/renovate-issue-23410-eks-addons-datadourse#12

Screenshot 2025-01-31 at 09 57 57
Screenshot 2025-01-31 at 09 58 11

@ivankatliarchuk
Copy link
Contributor Author

I found a bug, most likely in the versioning .

The change correctly detected as 1.19.2 but the actual change is 1.19.0
Screenshot 2025-01-31 at 10 08 11
Screenshot 2025-01-31 at 10 08 06

Shell I try to find an issue as part of this pull request, or submit a new one when this is merged?

@rarkins
Copy link
Collaborator

rarkins commented Jan 31, 2025

Fixes for versioning should be done in a separate PR

@ivankatliarchuk
Copy link
Contributor Author

ivankatliarchuk commented Jan 31, 2025 •
edited
Loading

Ok. Not able to reproduce this anylonger. Repository where tested multiple times https://github.com/ik-workshop/renovate-issue-23410-eks-addons-datadourse/pulls

The branch name is a bit weird due to packageName being an object and not a string, but rest is fine. Probably it should be some sort of a default function/behaviour that normalise all objects into a string.

Screenshot 2025-01-31 at 23 03 22
Screenshot 2025-01-31 at 23 04 58

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rarkins rarkins rarkins left review comments

@viceice viceice Awaiting requested review from viceice

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

customDatasources: allow to run external binaries to generate result
3 participants
@ivankatliarchuk @rarkins @viceice